debian: refine deb packaging for dtkcore

diff --git a/debian/compat b/debian/compat
index ec635144f60048986bc560c5576355344005e6e7..f599e28b8ab0d8c9c57a486c89c4a5132dcbd3b2 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10

diff --git a/debian/control b/debian/control
index 423c5581315993b8de8ae8a5429f2f3902b6af43..aa2065145ebc02151d5969344d8eb9b92eef5b30 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,24 +1,38 @@
 Source: dtkcore
 Section: devel
 Priority: optional
-Maintainer: Deepin Sysdev <sysdev@deepin.com>
-Build-Depends: debhelper (>= 9), qt5-default, pkg-config,
- qttools5-dev-tools, qtbase5-private-dev
-Standards-Version: 3.9.6
+Maintainer: Debian Deepin Packaging Team <pkg-deepin@lists.alioth.debian.org>
+Uploaders:
+ Boyuan Yang <073plan@gmail.com>,
+Build-Depends:
+ debhelper (>= 10~),
+ pkg-config,
+ qtbase5-dev,
+ qtbase5-private-dev,
+ qttools5-dev-tools,
+Standards-Version: 4.0.0
 
-Package: libdtkcore
+Package: libdtkcore1
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Multi-Arch: same
 Description: Deepin Tool Kit Core library
  DtkCore is base library of Deepin Qt/C++ applications.
  .
+ This package is part of DDE (Deepin Desktop Environment).
+ .
  This package contains the shared libraries.
 
 Package: libdtkcore-dev
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libdtkcore( =${binary:Version})
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: Deepin Tool Kit Core Devel library
  DtkCore is base devel library of Deepin Qt/C++ applications.
  .
- This package contains the header files and static libraries of DtkCore
+ This package is part of DDE (Deepin Desktop Environment).
+ .
+ This package contains the header files and static libraries of DtkCore.

diff --git a/debian/copyright b/debian/copyright
index bfa4a2d663b51de4c3d30fc4bebe6ba121542ed9..9f05d202b8bbc4ebb8a4e7a7d67396bbc96c8208 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,16 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: deepin-tool-kit
-Source: https://github.com/linuxdeepin/deepin-tool-kit
+Upstream-Name: dtkcore
+Source: https://github.com/linuxdeepin/dtkcore
 
 Files: *
 Copyright: Deepin Technology Co., Ltd.
+License: GPL-3+
+
+Files: debian/*
+Copyright: Deepin Technology Co., Ltd.
+           2017, Boyuan Yang <073plan@gmail.com>
+License: GPL-3+
+
 License: GPL-3+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

diff --git a/debian/docs b/debian/docs
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -0,0 +1 @@
+

diff --git a/debian/libdtkcore-dev.docs b/debian/libdtkcore-dev.docs
new file mode 100644 (file)
index 0000000..8a2bfbf
--- /dev/null
+++ b/debian/libdtkcore-dev.docs
@@ -0,0 +1,2 @@
+doc/Specification.md
+README.md

diff --git a/debian/libdtkcore-dev.install b/debian/libdtkcore-dev.install
index 682da5cdc56a4638ef02b723f29620c18ed87ebe..951b0df296fc3f3e7b328dec0ac19bd89461c7b4 100644 (file)
--- a/debian/libdtkcore-dev.install
+++ b/debian/libdtkcore-dev.install
@@ -1,3 +1,3 @@
-usr/lib/*/lib*.so
 usr/include
+usr/lib/*/lib*.so
 usr/lib/*/pkgconfig/*.pc

diff --git a/debian/libdtkcore.install b/debian/libdtkcore.install
deleted file mode 100644 (file)
index 3ddde58..0000000
--- a/debian/libdtkcore.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*

diff --git a/debian/libdtkcore1.install b/debian/libdtkcore1.install
new file mode 100644 (file)
index 0000000..3ddde58
--- /dev/null
+++ b/debian/libdtkcore1.install
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*

diff --git a/debian/rules b/debian/rules
index c9ac68c4ce6e72f43d5926cd14f43bc5698985d5..973f090b4d2f9faa65edaaaeb01dea7153896887 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,17 @@
 #!/usr/bin/make -f
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
-export QT_SELECT = qt5
+# -*- makefile -*-
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
+
+# see FEATURE AREAS in dpkg-buildflags(1)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export QT_SELECT := 5
+
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
-       dh $@ --parallel
+       dh $@
 
 override_dh_auto_configure:
        dh_auto_configure -- LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)

diff --git a/debian/source/format b/debian/source/format
index 89ae9db8f88b823b6a7eabf55e203658739da122..163aaf8d82b6c54f23c45f32895dbdfdcc27b047 100644 (file)
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (native)
+3.0 (quilt)